Removes junit 4 dependency #3627
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
codefromthecrypt
force-pushed
the
jupiter
branch
from
6b38f8b to
5fc9d2c
Compare
|
manually verified also, since there are a lot of lines. $ ag 'import .*junit.' --java --noheading |grep -v '^\s*$' | wc -l
352
$ ag 'import .*junit.' --java --noheading |egrep -v '(^\s*$|junit5|jupiter)'
zipkin-collector/activemq/src/test/java/zipkin2/collector/activemq/ITActiveMQCollector.java:27:import org.apache.activemq.junit.EmbeddedActiveMQBroker; |
added 2 commits
December 12, 2023 20:03
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
anuraaga
approved these changes
Dec 12, 2023
| @@ -187,37 +185,14 @@ | |||
| <!-- Do not add compile dependencies here. This can cause problems for libraries that depend on | |||
| io.zipkin.zipkin2:zipkin difficult to unravel. --> | |||
|
|
|||
| <dependency> | |||
| <groupId>junit</groupId> | |||
There was a problem hiding this comment.
Skimmed through a few files for kicks but this is probably the main change and if build is green then it looks like it worked well
|
Might be worth to followup with these AssertJ best practices once this is merged, or cherry pick that into here: |
|
Thanks @timtebeek I'll create a PR off your changes next. |
|
I'm seeing there's conflicts; would you want me to recreate the changes? That's trivial with the platform we have. |
|
added #3630 and will cut the minor afterwards |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes to the next minor so that we can remove the junit 4 compile dependency. To do so, this ports all tests to jupiter (v5) and stops publishing zipkin-junit (v4).
The plan is to cut a new version without any changes to the main tree. This will allow a cleaner cutover for server extensions who can first move to the latest patch, and subsequently the next minor. Specifically, this is for zipkin-gcp and zipkin-aws and I personally will handle this.
Note: Certain test libraries, notably testcontainers and activemq-junit have an indirect dependency on old junit. However, we don't re-export that in our zipkin-tests or zipkin-junit5 modules.
While I had to do some manual work, I had a lot of help from openrewrite. Here's the part that helped a lot.